build: Move grub2-15_ostree back to pkglibexecdir
authorColin Walters <walters@verbum.org>
Fri, 8 Apr 2016 14:28:17 +0000 (10:28 -0400)
committerColin Walters (automation) <walters+githubbot@verbum.org>
Mon, 11 Apr 2016 14:30:22 +0000 (14:30 +0000)
It's not quite namespaced enough to have
`/usr/libexec/grub2-15_ostree`, and the Fedora spec file expects
things in `/usr/libexec/ostree`.  Changing the spec file would be
annoying as we'd need conditionals.

Closes: #249
Approved by: gatispaeglis

Makefile-boot.am

index a2cdc28f1d551a01178969dcc3ebcd50a6fa5089..7ec54fa34d023a0968363b11de14991ef7b6e662 100644 (file)
@@ -41,10 +41,10 @@ endif
 
 if !BUILDOPT_BUILTIN_GRUB2_MKCONFIG
 # We're using the system grub2-mkconfig generator
-libexec_SCRIPTS = src/boot/grub2/grub2-15_ostree
+pkglibexec_SCRIPTS += src/boot/grub2/grub2-15_ostree
 install-grub2-config-hook:
        mkdir -p $(DESTDIR)$(grub2configdir)
-       ln -sf $(libexecdir)/grub2-15_ostree $(DESTDIR)$(grub2configdir)/15_ostree
+       ln -sf $(pkglibexecdir)/grub2-15_ostree $(DESTDIR)$(grub2configdir)/15_ostree
 grub2configdir = $(sysconfdir)/grub.d
 INSTALL_DATA_HOOKS += install-grub2-config-hook
 else